SLES 12 SP5 fixes #658
Merged
SLES 12 SP5 fixes #658
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tion of resource groups with resources
KimForss
added a commit
that referenced
this pull request
Oct 31, 2024
* Bring in HotFix repairs (#651) * Refactor deploy control plane script to remove unnecessary Terraform installation and Azure CLI installation * Refactor deploy control plane script to include sourcing deploy_server.sh and fixing Terraform ownership * Refactor deploy control plane script to include dynamic role assignment based on VM count and use managed service identity (MSI) for authentication * Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information Co-authored-by: Kimmo Forss <[email protected]> Co-authored-by: hdamecharla <[email protected]> * ansible python fix (#653) Co-authored-by: swatibehl <[email protected]> * Fix conditional statement in install_workloadzone.sh * Pipeline hotfixes (#654) * Refactor echo statements in deploy control plane pipeline * Refactor install_workloadzone.sh script to reset return_value variable * Refactor install_workloadzone.sh script to improve error handling * feng shui * Refactor variables_local.tf to improve readability and error handling * Refactor deploy control plane pipeline to include deployer_tfstate_key parameter * Refactor deploy control plane pipeline to include deployer_tfstate_key and landscape_tfstate_key parameters * Refactor echo statement in deploy control plane pipeline * Refactor remover script in deploy control plane pipeline * Refactor deploy control plane pipeline to remove unnecessary use_msi flag * Refactor deploy control plane pipeline to update default value for spn_keyvault_id * Refactor deploy control plane pipeline to update default value for spn_key_vault_arm_id * Refactor deploy control plane pipeline to trim deployer_tfstate_key in imports.tf * Refactor deploy control plane pipeline to include provider for azurerm.workload in imports.tf * Refactor deploy control plane pipeline to update storage account authentication and export TF_VAR_tfstate_resource_id * Refactor deploy control plane pipeline to update deployer and landscape state file paths * Refactor deploy control plane pipeline to remove unnecessary code in remover.sh * Refactor install_workloadzone.sh to export SPN key vault ID if keyvault is provided * Refactor tfvar_variables.tf to set default value of short_named_endpoints_nics to true * Refactor remover.sh to consolidate terraform destroy command * Refactor echo statements in remover.sh and remove-control-plane.yaml * Refactor echo statements in deploy/pipelines/01-deploy-control-plane.yaml * Refactor providers.tf to conditionally set use_msi based on var.use_spn * Refactor echo statements in deploy/pipelines/01-deploy-control-plane.yaml to improve clarity of deployment credentials * Refactor install_workloadzone.sh to improve argument parsing and readability * Refactor code for improved argument parsing and readability in install_workloadzone.sh * Refactor LandscapeModel.cs, LandscapeDetails.json, and LandscapeTemplate.txt to add prevent_deletion_if_contains_resources property * Refactor package dependencies in os-packages.yaml * Refactor ansible role to remove unused variable and update passlib dependency * Refactor echo statement in install_workloadzone.sh for improved clarity --------- Co-authored-by: Kimmo Forss <[email protected]> * Suse 12 fix for python (#656) * suse 12 fix for python * Update 1.17.1-pre_checks.yml * Update 1.17.1-pre_checks.yml Fix linting issues --------- Co-authored-by: swatibehl <[email protected]> Co-authored-by: hdamecharla <[email protected]> * SLES 12 SP5 fixes (#658) * Fix conditional statement in install_workloadzone.sh * Fix subscription_id assignment in providers.tf * Fix indentation in deployment credential messages * Fix deployment credential messages and subscription_id assignment * chore: enable Azure scheduled events resource start and display output on SUSE * Refactor deployment script to improve readability and remove unnecessary output * Update provider version to 4.7 * Refactor tfvar_variables.tf to add a new variable for preventing deletion of resource groups with resources * Add prevent_deletion_if_contains_resources variable to SystemModel.cs * Refactor deployment script to improve readability and display deployment credentials * Refactor deployment script to enable Stonith and concurrent fencing * Refactor tfvar_variables.tf to add prevent_deletion_if_contains_resources variable * Refactor validate.yml to remove single quotes from crm_resource output * Refactor validate.yml to remove single quotes from crm_resource output * fix ansible schema errors * Refactor validate.yml to remove unnecessary 'when' condition --------- Co-authored-by: Kimmo Forss <[email protected]> Co-authored-by: hdamecharla <[email protected]> * extend timeout for zypp (#657) Co-authored-by: swatibehl <[email protected]> --------- Co-authored-by: Kimmo Forss <[email protected]> Co-authored-by: Kimmo Forss <[email protected]> Co-authored-by: Swatibehl <[email protected]> Co-authored-by: swatibehl <[email protected]>
KimForss
added a commit
to KimForss/sap-automation
that referenced
this pull request
Oct 31, 2024
* Fix conditional statement in install_workloadzone.sh * Fix subscription_id assignment in providers.tf * Fix indentation in deployment credential messages * Fix deployment credential messages and subscription_id assignment * chore: enable Azure scheduled events resource start and display output on SUSE * Refactor deployment script to improve readability and remove unnecessary output * Update provider version to 4.7 * Refactor tfvar_variables.tf to add a new variable for preventing deletion of resource groups with resources * Add prevent_deletion_if_contains_resources variable to SystemModel.cs * Refactor deployment script to improve readability and display deployment credentials * Refactor deployment script to enable Stonith and concurrent fencing * Refactor tfvar_variables.tf to add prevent_deletion_if_contains_resources variable * Refactor validate.yml to remove single quotes from crm_resource output * Refactor validate.yml to remove single quotes from crm_resource output * fix ansible schema errors * Refactor validate.yml to remove unnecessary 'when' condition --------- Co-authored-by: Kimmo Forss <[email protected]> Co-authored-by: hdamecharla <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
This pull request introduces several changes across different files to enhance functionality, update dependencies, and improve logging and debugging. The most important changes include adding a new property to prevent resource group deletion, updating Azure package versions, and enhancing the deployment scripts with more detailed logging and error handling.
Enhancements to Resource Group Management:
Webapp/SDAF/Models/SystemModel.cs: Added a new nullable boolean propertyprevent_deletion_if_contains_resourceswith a default value oftrueto prevent deletion of resource groups containing resources.Webapp/SDAF/ParameterDetails/SystemDetails.json: Added a new parameterprevent_deletion_if_contains_resourcesto the JSON configuration to support the new property.Webapp/SDAF/ParameterDetails/SystemTemplate.txt: Included the new parameterprevent_deletion_if_contains_resourcesin the system template.Dependency Updates:
Webapp/SDAF/SDAFWebApp.csproj: Updated theAzure.Identitypackage from version1.13.0to1.13.1.deploy/terraform/bootstrap/sap_deployer/providers.tf: Updated theazurermprovider version from4.6.0to4.7.0.Deployment Script Improvements:
deploy/ansible/roles-os/1.17-generic-pacemaker/tasks/1.17.2.0-cluster-Suse.yml: Added tasks to ensure the Azure scheduled events resource is started and display its status.deploy/pipelines/02-sap-workload-zone.yaml: Removed redundant Terraform version check to streamline the script.deploy/pipelines/03-sap-system-deployment.yaml: Enhanced the script to sourcedeploy_server.sh, set secrets, and improve error handling during the Azure login process.deploy/pipelines/04-sap-software-download.yaml: Improved logging messages and added detailed output for key vault and variable group information. [1] [2] [3] [4] [5]deploy/pipelines/05-DB-and-SAP-installation.yaml: Enhanced logging and validation steps, and improved the handling of deployment credentials and environment variables. [1] [2] [3] [4] [5]Solution
Tests
Notes